Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli rebase: do not allow -r --skip-empty #2642

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Conversation

ilyagr
Copy link
Contributor

@ilyagr ilyagr commented Nov 27, 2023

This follows up on 3967f63 (see that commit's description for more motivation) and @matts1 's e79c8b6.

In a discussion linked below, it was decided that forbidding -r --skip-empty entirely is preferable to the mixed behavior introduced in 3967f63.

3967f63#commitcomment-133539911

Checklist

If applicable:

  • n/a I have updated CHANGELOG.md
  • n/a I have updated the documentation (README.md, docs/, demos/)
  • n/a I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@ilyagr ilyagr marked this pull request as ready for review November 27, 2023 06:49
This follows up on 3967f63 (see that commit's description for more
motivation) and e79c8b6.

In a discussion linked below, it was decided that forbidding `-r --skip-empty`
entirely is preferable to the mixed behavior introduced in 3967f63.

jj-vcs@3967f63#commitcomment-133539911
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@ilyagr ilyagr merged commit 6aef4bb into jj-vcs:main Nov 27, 2023
15 checks passed
@ilyagr ilyagr deleted the rskipempty branch November 27, 2023 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants